Add flag and remove mapping class