Redesigned API