More function mapping changes.