Fixed TEntity type in EntityBuilder