Change pid to 17 bits and local id to 15 bit;   This is temporary and will
change when this package is refactored