Removed gateway in favor of commandSet + protcol