added support of basic types