Added multiple tags support