Adding support for android in some components (more to come)