Added implementation for new APIs