Added Property getter check
Added check for property setter
Refactored code a bit.
Added additionalLocations
Updated binary