Added refreshing of entities