New models, no entities, less web, more config