Refactor Untyped API's to be more UX friendly