Fixed mapping and services configs