Adapted to latest Core change (entities aren't typed data anymore).