Internal api (36/38)

Internal api