Refactored LRTableBuilder