Added in the new types of moles