Added multiple element functionality