Better handles missing attributes