Initial changes - base id/queries/service plus user entity/queries/service and simple test