Add integer unmarshalling
Group swift files