Added functionality to collection classes