Add support for function mapping