Improve read data procedure