Added loggers / refactoring / exceptions