Updated export