WoT Model refactored