Entity improvements for fixtures