Switched validators to use filters instead of checking manually.