Reinstated all type synonyms and added concrete versions