Small refactor -> move logic to Plugin\Manager so we can better refactor it later on