Added case statements for missing maps