Added possibility to add & remove parent device in-place