dao modified to use @NotNull method parameters