Added support for octohost