Add the concept of collections back in