Adding 'Address' annotation support.