Further improvment of the Butten API