Added a TODO to check if it is needed to add access-token in the response header