added support for additional graph types