Local part collections & restart support added.