Restructured command initialization for easier extension
Support for graph annotations