Better handling of irregular data