Added support for Persistors and Removers and Handlers.