Feature/now 337

I recommend being explicit here with a classname vs `*`.