Reworked the Wol class, included a factory