Includes the possibility of having token validation and public services. Fixed broken references.