Add configs, change AppKernel logic