Fix wrong Handler<Set<JsonObject>> -> Handler<Set<Map<String, Object>>
Remove redundant code
Update to new options interfaces