Made containers more GC-friendly