3.0.0: New leaner API