Added support for multiple members