Adding export settings, code optimalizing