Merge of new API