Tooling to make EF better