Improve dao's.