Improve data layer
Create simple DAO class