Improved XEcom component