update to entities api