Cleanup
Add user authorization