Minor improvements error handeling
Remove old file
Fix import
First part making old datatypes work with extented model