Fixed runtime dependency for comments, events and attachments