Added templates for cyclic depdendency detection
Improved cyclic dependecy detection templates