Updated to reflect usage changes