Implemented changes from AS sdka