Updating for circular import