Expanded API