Fixed a circular reference in imports