Adding a switch for a better code visibility