Cosmetics + added Q NuGet pkg