Removed hard-coding of org