Refactor fields and make objects commentable