Adapted and simplified export, makes it easier to implement on new systems and improves performance.