Change where the check for extra features being enabled happens. Don't
add DB rows if extra features are not enabled.