update comment and event models to make it simpler for now