Changed to Hook system to include file, and class in addition to function.