Split models and fix DbContext