Is it really necessary? I think that making `cls` `universal` should already add it?