added graph support as advanced feature