- Fixed type system not handling generics and modifiers correctly