Start adding support for APIs 9-16