Added address details to property model
Refactor into smaller methods + saving address details