Update to work with newer versions