[Framework] Fixed dependency order