Updated property alias handling