Migrating Handle devel-api to public-api