Adding calculation of mapped features