Change of structure, now number and prefix are stored separately in the structure