Improved EntityState functionality