Prepare API for the upcoming version 2