-- outgoing module management additional enhancements