Data Acess improvements