Using new API after the merge