merge current API with versioning