DB schema fixed for Oracle