Started migration towards BPF (not compiling)