Fix DB model definition

Also .idea/misc.xml file with user specified data excluded.