Updating for new preview API