Extra model outputs

There are some commented-out annotations in this class.