WBL: More refactor