Updated to reflect buff API changes