Update with new API and make some enhancement