Added login and token authorisation