Move wastecollection to its own model