Removed Absraction layer from data handler
created single data model for app