Adjust buffer change event support to check the type