Better handling of extend parameters