Added carrierwave and uploader