Updating internal commands and options parser