Remove LongIDLeafNode and Create ExtendedLeafNode