Revised function mapping.