Updates to entity models