More updates to new interfaces