Added preliminary api