changed all classes to include self.collection