Case Management System Enhancements