Working a little on the API