Add Hybrid Support