- some refactorings for Context
 - added logger and refactorings for it