Changed ClassMapper to having only static methods