Fixed circular import error