Added a handler system.