Updated transaction and property handling for 2.0.0-M06 compatibility