Add feature: extended number lists
Update changes with merge