Add lazy flag to avoid circular reference