Added JSR-303 NotNull annotations