Issue with cyclic dependency resolved.