Initial add for extracted API