Add better rake completion