API Changes, added Android class