Improving some aspects in DAO's.