Reverting to static options parsing