Internal api (34/38)

Internal api