Update types
Fix dependency loading and add new types. It takes 500ms to load all classes, probably should be a faster solution