Change Oblique to receive data-models with data & classes