[TASK] Use makeInstance in some hooks