Better structure with createXaDatasourceModelNode()
Cleanup