Added runtime options