Added multiple comments boxes support