Added macrolanguage mapping