#7 - master - few refactor + modify data schema for Oracle support