Small updates to make the manager generic