Improved URL mapping.