Adds mountpath support