Add Kernel as well as non-opensource counterparts.