Write optional route annotation support.
Cleaning up code. Adding command.