Added compo handler, todo is to create command