Small abstraction added