More updates for new interface