Yea, I will add Android handler as well for now.