Improve output buffering
Add new feature to discover capabilities