Support for Octopus 2.0