Added defaults for null values