Add more supported classes for assignment 2