Adding comment handling.