Require commands/generator only if needed

We don't need it at all e.g. in production
Require commands/creator only if needed