Update Entities (should be correct now?)