Move "entity" to datatypes