Make google-cloud module a bit more smarter