WEB-2930: Made type a mandatory property

Hey @kevinhodges & @hpoom I've made the required changes for WEB-2930. Can I get a code review please.
Can you tweak this comment from '7' to '8' pls