Changed basic types into a table