Change how to handle PostCode and Surname