Some 'final' changes
Update variant keys