Added autoscout to fix issues with backwards compatbility