Refactor DAO/BO