Added the combo class and added annotations everywhere