Added type abbreviations