Minor refactor to make room for new kernels