Added Class distinction