[DEV] change some internal interface