ELENAVM / ELENASM API refactored