Added bug/feature toggle and db entry.