Update to work with rails 4