Add discovery model for Oxygen
37 files changed