Add EFModels and smal changes/fix