Added container helper functions