Added mountpoint to address mapping