Updating versions and adding Android