Added Security for multi-tenancy