Bug fix: Comment
Update entity
Add different db