Allow v1.1 and v2 APIs for Compute

Fixes #353.