Added flags for optional graph items