Drafting of new, improved API