FSTAB: Updated to unified system