Updating to use vars and extend by default.
Updating to use vars and extend by default