Adding options for enabling organizations and locations