Adding support for Oz