Changing the structure to be able to execute different IoCs