small changes on API and form to not pass by the form for the moment