Adding some classes I missed.