Added class map and tests