Restructured pin-management