Added suggestion handling.