Modules

Add callbacks to existing functions.