Generalized the PropertyMapping