Add google-apis and do more work