Improved addexp functionality