API rebase & small enhancements