Add public api support