Code cleaning
Added super key