Generalized things and made more classification classes