Adding feature switching capabilities