Add mountpoint parsing