Made delivery more generic