Updating structure simplifying implementation
Comments
Some updates for PropertySetter