Use correct options map