Extend mapping