changes for new oracle branch