Added classes to handle category types