Add authentication and limitation