Fix raw type warnings and add Iterable to Message