Add key variable and some comments