Added couple of API enhancements