Support for P16 (no support for P15 planned)