Updated entityx