Internal api (29/38)

Internal api