Refactoring; added possibility to disable reload