Minor optimization in SystemsController
Started making graph code more generic