Add support for custom task mapping