Some Improvements in API