entity store improvements