Added android part