Updated for newer version of Rake