Removing circular import