Update to fit to v2.0 constraints
Cleanup customisations
Improve ds_graph_opts processing