Updated with v1.2 changes