Added android implementation