Add unmount and allow mount to use default selector function
docs