Added level of abstraction in order to ease debugging