Removing cyclic dependency