Add Hybrid Settings Support