Added compo id to match, and added checkin state