Added Email, Url, CreditCard and EqualTo support