Added support to several graph subtypes
some implementation fixes