Updated dependencies and few classes added