Feat/cam/event structure