Change to beta service to be more agile