Feature/improve api for hquenin