Only include source entity if source is present
Add comments endpoint
Implements comment