Server code refactoring, args escape