Fix dependency issue and make some progress