Collection: Improve Elasticity