Add run-time option