Fixes class and add comment about URI.