Add db option back in.