Refactor to use new data access object.