Added switch inputs and module so that switches can be loaded.