Tweak and add rake task