Merge with old APIs