Some enhancements in various part of the API