Improve graphs performance