Adds more classes for ControlGraph

Issue: #32