Change kernel to store unique ptrs of services