some small changes to entity structure