Modify rake to work with new style