Added oracle and baseline