Graph definition classes mock enhanced