Added defaults for variables