Fixed a circular import issue with models