Improved AbstractUrl code