Add common map vc. Changed coredata model & version.