Better handling of additional rows