Tested method repository
More null safety by using optionals