add API10+ support