Added type defaults