Add command alternatives for client/server