Enhancements in dao and helper class