Add reading improvements