Fix framework support