Added functionality of adding classes