made comments optional for po model