Fixed extended containers and save handling