Updated to WoD

Big clean up and adjusted to WoD changes