Ensure Additional Properties for CM Handles are included