Added new JPQL queries