Fix automount option.
Add moount point class.