Added support for simple closures, handlers can now be added later