Added parameterized support for enabling locations and organizations