Moved ArgumentsHandler to separate file