Small refactoring & Oracle mappings sketch