Add partial savedjobs support