I strived to keep the original APIs identical. 
If that's not required, I would like to make this change.  Kindly confirm?