Updated type system and partially added wrappers