Improve coverage module
Improve API and WS-HT