Including models.
Fixed reference to user.  Generalized with self.