Moved validators to separate file