Attempt to remove dependency cycle