Changed list and maps to support Objects instead of NBT tags