Remove NOT SUPPORTED
Add authentication