Updated for OSS deployment