Add solution for NonStandardLibrary