Update to work with renamed Grapht components