add jpql support and or utility