UriTemplate and BNodeTemplate in OBDADataFactory refactored