Enhance API
Merge