Enhancing commands and parsing