Added Command parser