Added rake and trvis