Removed the dependence on JpaTemplate