Updated name-spacing
Updated resource & transport load process