Adding URI resolver support
Lots of header comments