Brought in line with latest API version