Added type defs