Changed the getting of types to be a bit more intuitive. REOL-79
Use the new function. REOL-71