Better handling of inner classes in ArchiveBuilder
Remove TODOs