More consolidated mapping