Unifying the command structur