Oracle refactor to 1.1.0

Oracle refactor to 1.1.0