Improve DAO Layer