Attempting to remove circular dependency