REDESIGN: API Only