Updated Organization Controller