Added support for addressLine3