Moved Service and Impl into same package
Changed to NamedQueries