Added multi-kernel feature