Adding support for local-properties