Add switches to enable loading from commercial feeds