Template cleanup
More complete models.