Now recording class name as well