As a side note, I'm not sure yet if we really need this extra class.