Updated our import of auto classes. Simplifies changing auto routines.