Added default values to some variables