Updated to API version 11