Updated baseUri retrieval
Added method to get the baseUri of a resourceUri
Updated baseUri retrieval