Streams ucp module code enhancements