Internal API - under development