updated unimapper