API restructuring.