Added @When, @Integer and @NotEmpty