Reorganizing keys & some new ones