Adding Auto Classes