added datatypes and Entities