Enhancing WeXAR library. (WIP)