Improved Paperclip / AWS functionality