Added possibiliy of alternate class