Replace collection classes with data methods