Adding support for multiple pins