Added proper authentication