Use lists instead of nelists (non-empty lists)
Add all missing interface files