Gen 2: Add NFE tiering