Added more documentation & URIs functionality