Packing ExtType and some cleanup