Updated: Minor improvements to url handling and class method argument naming