Refactor data access object