Added class detection override.