Added a couple of datatypes (string/number/integer)