Add support for Oscar 1.0