Inclusion of the Mapping class to the Framework
New major changes on the whole application