Moved cluster types into db.