Fixing some syntax
updating PaymentEntity
Updating `PaymentService` to use `PaymentQueries`