Added octopus support.