[TIMOB-16386] Finished updating the hooks to use the updated detection system.