Assignment 6: Added common classes