Adding more missed variables to feature.

Don't want to miss a thing.