Changed DAO's to more generalized query syntax using criterion