Add support for oC 6.0.1