Refactors property expression mapping