Refactor Model to use DAO Pattern