Removed cyclic dependency