Added a bunch of new classes
Updated FromJson-Methods