SLC mapping and ifdefs added