Last changes to make clear the new api needs