Smarter YayClass