Migration to Hybrid Framework