Adding new classes to make term collection easier