Added changes to work with older version of buffer explorer