Made the type system dynamic