Use opt helpers instead of hardcoded paths