Internal api (6/38)

Internal api