API Updates for 3.1 compatibility

Non-backwards compatible changes for 3.1 updates