improve entity repo service, validator