Added class identification