BF - WIP - Prepare for unmount command.