added datatypes!