Reapplied api changes for further testing