Some more API call drafts and tools enhancement