Re-Created some entities and changed the DB a bit