Added SimplePropertyNameMapper