[Andrew/Remo [MIGRATION]] added year and code on questionnaire and country models respectively