Add feature switches for easier customization