Add @NotNull
Refactoring repository system