Convert more operations to rake