Updated KZPropertyMapper