added new schema + migration code
changed core data scheme