Moved to custom_rake