moved to Comment entity structure