Fixing comments ORM usage