Added client and server side authorization