Moving validators to the the domain layer