small design changes for apis < 11