Moving numeric to container
Moving (kernels -> detail) + ifdefs