Completely redesigned API