No need to explicitly define forEach and spliterator
Making the IdMaps serializable
Making debugging a little easier
Merge branch 'development'