Added data oriented functions to api