TODO on NotNull<> template added