Add old handlers (these need to be redone)