Public API update 2

Updated sources for new API