Add prefix/suffix handling in PropertyMapping