re #5 : rename AddressId to addressId
re #5 : Removed the TODO, will be fixed in the addCustomer