refactor all handler APIs
add shortcut for API
remove m2e nature again - does not work as well as expected