Moved validators into Role