Added Kernel + Manager headers
Merged filters