Added entries for W, X, Y and Z