Updated links expansion and URIs definitions.