Refactor TLD