Update to reflect usage changes