Adds a DAO class
Refactor to extract code to new common utility classes
Improves the layout extension