few more calls converted to api