Fixes for function and additions to graph templates