change to conform with new entities format