Adding some functionality to support android