Enhanced API docu