Adding two new classes to handle new status
merging commits