Added admin graphing support