Changed mapping and fixture