Rework v2 header format
Housekeeping, new keyword implementation (mpenet)