Add language mapping support