Improved URL format