Updated mapping class (working now on controller)