updated all the items and added stretchr support