Add strictness to Generation