Refactored ConnectionCommands