Refactored, added instance into HandlerConfig struct