added client side multiple reference support