Added mapping to macro