Added in some more vanilla variables