Entity lib now only contains datatypes