Internal api (30/38)

Internal api