A little change of the API