Added commands and defaults