changes for enterprise version