Added support back to api version 10