Add more validators to remove demo