Added Command class for better command manipulation.