Added while loop in user extensions