Attempt to remove circular imports