Add rate control options
Add a few more graph defs