Added Phone Number and Email classes