Added Types and typeOf