Added some major changes with info classes