Removed lot of UA deadfile, added datamodel
Added entities