Added default values for optional variables