about to change entity models