Added support for parsing resources using the right base URI