Is there a way of dong this without introducing things like this? If not, we need to add one.