Don't grab the command until we need it [ci skip]
Add features