Add commands for demonstration and re-organize semantically.