Improved class-id-slot-name