Initial amf3 changes