Extracted validators to own classes