Updated optional argument based APIs