Reworked parts of WarLib.ADT