4.1.95: Some API modification