changes to support clustering