Merge of the new API version