Updated rake tasks