Updated to match options JSON structure