More rake refinements
More rake refinements