Added support for more odata urls & some clean up