Added initial URL parsing