Added multiple identifier support