Added api 10 compatibility