Change mapping, fix spelling, add service creation