Support DAO pattern. Improvements.