Expanded API to include full metrics-graphics API