Enhanced the kernel and the routing procedures