Change code structure / Try support reader