Changed array/map defaults to empty containers