Modified imports to work on GCE