Remove type parameter from System, add back to update