Added Pinheader with pinswap support