Added comment model
Update relationships
Add default ordering