Remove obsolete code
Better definition of the API

Upgrade the ender description