Added missing classes and some other updates