Made more resilient to missing values or keys