Added mount options support