Some work on entity and some fix on item