Added support for handlers using optional map and :with key