Fixing project after split-api branch change