changed dao methods to use Entity objects