Added AUTO compatibility