First version of api changes