Add zProperty support