Refactoring + thesarus
OIS refactoring