Update to work with latest software
More compatibility