Refactored to be align with Hybrid Framework