Minor cleanup
Added classes for new concept.