Implemented remaining 2.16.x methods