Added MappigViewModel etc.