Added posibillity to chose whether to add a type descriptor
macros