Updated to work with the modified JWx implementation.