Added pins support