Added optimizations of property mappings