Internal api (26/38)

Internal api