Update for new usage