Changes to work with orca-examples