changed system structure (Database and Deck seperate types now)