Added commands and options