Fixed a mistake in the database.
More refactoring.