Added @property
Merge branch 'transaction-properties'