Added runtime switch