Updated to use a simplier validation library