Updated to work with Cascade Server 7.12.1