Minor changes to container types - step3