More changes for Oredev