Added 'Draw' safety
Added type synonyms