New api fixes

New api fixes