Some improvements in [pins.h]