Added a few more default vars