Added android completion